merge r21833

SVN-Revision: 21834

diff --git a/target/linux/orion/base-files/lib/upgrade/platform.sh b/target/linux/orion/base-files/lib/upgrade/platform.sh
index def241d4b52f5b7604e13b7841f9d246a7bbbaf7..fdd26c5176c9b2b5d33a3df6c4a56a701087e009 100644 (file)
--- a/target/linux/orion/base-files/lib/upgrade/platform.sh
+++ b/target/linux/orion/base-files/lib/upgrade/platform.sh
@@ -9,13 +9,21 @@ platform_check_image() {
 
        case "${hardware}" in
         # hardware with padded uImage + padded rootfs
-        'Netgear WNR854T' | 'Linksys WRT350N v2')
+        'Linksys WRT350N v2')
                [ "${magic}" != '2705' ] && {
                        echo "Invalid image type ${magic}."
                        return 1
                }
                return 0
                ;;
+        # Netgear WNR854T has extra header before uImage
+        'Netgear WNR854T')
+               [ "${magic}" != '8519' ] && {
+                       echo "Invalid image type ${magic}."
+                       return 1
+               }
+               return 0
+               ;;
        esac
 
        echo "Sysupgrade is not yet supported on ${hardware}."